Merge branch 'master' into cairo, fixes tooltips not shown.

author Jan D <jan.h.d@swipnet.se>

Fri, 3 Apr 2015 12:02:13 +0000 (14:02 +0200)

committer Jan D <jan.h.d@swipnet.se>

Fri, 3 Apr 2015 12:02:13 +0000 (14:02 +0200)
author Jan D <jan.h.d@swipnet.se>
Fri, 3 Apr 2015 12:02:13 +0000 (14:02 +0200)
committer Jan D <jan.h.d@swipnet.se>
Fri, 3 Apr 2015 12:02:13 +0000 (14:02 +0200)
diff --cc ChangeLog
Simple merge
diff --cc configure.ac
Simple merge
diff --cc lisp/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/xterm.c
Simple merge
author	Jan D <jan.h.d@swipnet.se>
	Fri, 3 Apr 2015 12:02:13 +0000 (14:02 +0200)
committer	Jan D <jan.h.d@swipnet.se>
	Fri, 3 Apr 2015 12:02:13 +0000 (14:02 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history